1 files changed, 16 insertions, 7 deletions
diff --git a/pages/en/anime/watch/[...info].js b/pages/en/anime/watch/[...info].js
index f918f86..a838b7f 100644
--- a/pages/en/anime/watch/[...info].js
+++ b/pages/en/anime/watch/[...info].js
@@ -29,8 +29,12 @@ export async function getServerSideProps(context) {
     };
   }
 
-  const proxy = process.env.PROXY_URI;
-  const disqus = process.env.DISQUS_SHORTNAME || null;
+  let proxy;
+  proxy = process.env.PROXY_URI;
+  if (proxy.endsWith("/")) {
+    proxy = proxy.slice(0, -1);
+  }
+  const disqus = process.env.DISQUS_SHORTNAME;
 
   const [aniId, provider] = query?.info;
   const watchId = query?.id;
@@ -114,7 +118,7 @@ export async function getServerSideProps(context) {
       epiNumber: epiNumber || null,
       dub: dub || null,
       userData: userData?.[0] || null,
-      info: data.data.Media || null,
+      info: data?.data?.Media || null,
       proxy,
       disqus,
     },
@@ -179,9 +183,10 @@ export default function Watch({
 
       if (episodes) {
         const getProvider = episodes?.find((i) => i.providerId === provider);
-        const episodeList = dub
-          ? getProvider?.episodes?.filter((x) => x.hasDub === true)
-          : getProvider?.episodes.slice(0, getMap?.episodes.length);
+        const episodeList = getProvider?.episodes.slice(
+          0,
+          getMap?.episodes.length
+        );
         const playingData = getMap?.episodes.find(
           (i) => i.number === Number(epiNumber)
         );
@@ -219,6 +224,7 @@ export default function Watch({
     return () => {
       setEpisodeNavigation(null);
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sessions?.user?.name, epiNumber, dub]);
 
   useEffect(() => {
@@ -287,6 +293,8 @@ export default function Watch({
       });
       setMarked(0);
     };
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [provider, watchId, info?.id]);
 
   useEffect(() => {
@@ -524,7 +532,7 @@ export default function Watch({
             </div>
             <div
               id="secondary"
-              className={`relative ${theaterMode ? "pt-2" : ""}`}
+              className={`relative ${theaterMode ? "pt-5" : "pt-4 lg:pt-0"}`}
             >
               <EpisodeLists
                 info={info}
@@ -534,6 +542,7 @@ export default function Watch({
                 watchId={watchId}
                 episode={episodesList}
                 artStorage={artStorage}
+                track={episodeNavigation}
                 dub={dub}
               />
             </div>